Bill Skaggs <weskaggs@primate.ucdavis.edu>

	* gtk/gtkprogress.h: revert last change by Matthias -- it broke the
	build of gtkprogressbar.

diff --git a/ChangeLog b/ChangeLog
index 66a71b8ae1da55b33c2d6db978950e3136cc8fbc..923afd0234c8c25342dfca0bedd5df32e69bd96f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-29  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+       * gtk/gtkprogress.h: revert last change by Matthias -- it broke the
+       build of gtkprogressbar.
+
 2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66a71b8ae1da55b33c2d6db978950e3136cc8fbc..923afd0234c8c25342dfca0bedd5df32e69bd96f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-06-29  Bill Skaggs  <weskaggs@primate.ucdavis.edu>
+
+       * gtk/gtkprogress.h: revert last change by Matthias -- it broke the
+       build of gtkprogressbar.
+
 2006-06-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (gdk_event_translate): Update the 

diff --git a/gtk/gtkprogress.h b/gtk/gtkprogress.h
index 76c005f4fbf2ac7ce233861997d9f825729ea275..477ae33d574193485dbb6a291d794385593331aa 100644 (file)
--- a/gtk/gtkprogress.h
+++ b/gtk/gtkprogress.h
@@ -35,7 +35,7 @@
 
 G_BEGIN_DECLS
 
-#if !defined (GTK_DISABLE_DEPRECATED)
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 #define GTK_TYPE_PROGRESS            (gtk_progress_get_type ())
 #define GTK_PROGRESS(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_PROGRESS, GtkProgress))
@@ -44,7 +44,7 @@ G_BEGIN_DECLS
 #define GTK_IS_PROGRESS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PROGRESS))
 #define GTK_PROGRESS_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_PROGRESS, GtkProgressClass))
 
-#endif /* !GTK_DISABLE_DEPRECATED */
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
 typedef struct _GtkProgress       GtkProgress;
 typedef struct _GtkProgressClass  GtkProgressClass;
@@ -84,7 +84,7 @@ struct _GtkProgressClass
  * directly.
  */
 
-#if !defined (GTK_DISABLE_DEPRECATED)
+#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
 
 GType      gtk_progress_get_type            (void) G_GNUC_CONST;
 void       gtk_progress_set_show_text       (GtkProgress   *progress,
@@ -114,7 +114,7 @@ gdouble    gtk_progress_get_current_percentage (GtkProgress *progress);
 gdouble    gtk_progress_get_percentage_from_value (GtkProgress *progress,
                                                   gdouble      value);
 
-#endif /* !GTK_DISABLE_DEPRECATED */
+#endif /* !GTK_DISABLE_DEPRECATED || GTK_COMPILATION */
 
 G_END_DECLS